From: Nick Roberts <nickrob@snap.net.nz>
Date: Sun, 3 Jun 2007 00:58:39 +0000 (+0000)
Subject: (Fmouse_position, Fmouse_pixel_position):
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18665
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ede85b0531b2e51ba75e3e2c11df9a075809b30f;p=emacs.git

(Fmouse_position, Fmouse_pixel_position):
Condition on HAVE_GPM too.
---

diff --git a/src/frame.c b/src/frame.c
index ab91af264dc..0e24ad59627 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1450,7 +1450,7 @@ and returns whatever that function returns.  */)
   f = SELECTED_FRAME ();
   x = y = Qnil;
 
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
   /* It's okay for the hook to refrain from storing anything.  */
   if (mouse_position_hook)
     (*mouse_position_hook) (&f, -1,
@@ -1494,7 +1494,7 @@ and nil for X and Y.  */)
   f = SELECTED_FRAME ();
   x = y = Qnil;
 
-#ifdef HAVE_MOUSE
+#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
   /* It's okay for the hook to refrain from storing anything.  */
   if (mouse_position_hook)
     (*mouse_position_hook) (&f, -1,
@@ -1581,6 +1581,13 @@ before calling this function on it, like this.
       Fselect_frame (frame);
       mouse_moveto (XINT (x), XINT (y));
     }
+#else
+#ifdef HAVE_GPM
+    {
+      Fselect_frame (frame);
+      term_mouse_moveto (XINT (x), XINT (y));
+    }
+#endif
 #endif
 #endif